From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 29 Aug 2008 09:45:09 +0000 (+0100)
Subject: pv-grub: fix example file
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14113^2~9
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=ec6869dadc5c3dabcd441e796829dd20a738dda6;p=xen.git

pv-grub: fix example file

Apparently 64MB is too short for the domain builder.
No kernel option should be passed, as they are provided by menu.lst,
and would only confuse grub.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub
index a856028ac2..2d647c9365 100644
--- a/tools/examples/xmexample.pv-grub
+++ b/tools/examples/xmexample.pv-grub
@@ -25,7 +25,7 @@ extra = "(hd0,0)/boot/grub/menu.lst"
 # WARNING: Creating a domain with insufficient memory may cause out of
 #          memory errors. The domain needs enough memory to boot kernel
 #          and modules. Allocating less than 32MBs is not recommended.
-memory = 64
+memory = 128
 
 # A name for your domain. All domains must have different names.
 name = "ExampleDomain"
@@ -118,32 +118,6 @@ disk = [ 'phy:hda1,hda1,w' ]
 # greater or equal to 1.
 #vtpm = [ 'instance=1,backend=0' ]
 
-#----------------------------------------------------------------------------
-# Set the kernel command line for the new domain.
-# You only need to define the IP parameters and hostname if the domain's
-# IP config doesn't, e.g. in ifcfg-eth0 or via DHCP.
-# You can use 'extra' to set the runlevel and custom environment
-# variables used by custom rc scripts (e.g. VMID=, usr= ).
-
-# Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
-# Set netmask.
-#netmask=
-# Set default gateway.
-#gateway=
-# Set the hostname.
-#hostname= "vm%d" % vmid
-
-# Set root device.
-root = "/dev/hda1 ro"
-
-# Root device for nfs.
-#root = "/dev/nfs"
-# The nfs server.
-#nfs_server = '192.0.2.1'  
-# Root directory on the nfs server.
-#nfs_root   = '/full/path/to/root/directory'
-
 #----------------------------------------------------------------------------
 # Configure the behaviour when a domain exits.  There are three 'reasons'
 # for a domain to stop: poweroff, reboot, and crash.  For each of these you